User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Indonesian)
Using index info to reconstruct a base tree...
A	po/id/rawhide/nav.po
A	po/id/rawhide/pages/Revision_History.po
A	po/id/rawhide/pages/_partials/Legal_Notice.po
A	po/id/rawhide/pages/desktop/Desktop_index.po
A	po/id/rawhide/pages/developers/Developers.po
A	po/id/rawhide/pages/developers/Development_Binutils.po
A	po/id/rawhide/pages/developers/Development_C.po
A	po/id/rawhide/pages/developers/Development_Go.po
A	po/id/rawhide/pages/developers/Development_Haskell.po
A	po/id/rawhide/pages/developers/Development_LLVM.po
A	po/id/rawhide/pages/developers/Development_Python.po
A	po/id/rawhide/pages/developers/Development_Ruby.po
A	po/id/rawhide/pages/developers/Development_Tools.po
A	po/id/rawhide/pages/developers/Development_Web.po
A	po/id/rawhide/pages/index.po
A	po/id/rawhide/pages/sysadmin/Distribution.po
A	po/id/rawhide/pages/sysadmin/Installation.po
A	po/id/rawhide/pages/sysadmin/Networking.po
A	po/id/rawhide/pages/sysadmin/Printing_Scanning.po
A	po/id/rawhide/pages/sysadmin/Security.po
A	po/id/rawhide/pages/sysadmin/Storage.po
A	po/id/rawhide/pages/sysadmin/Sysadmins.po
A	po/id/rawhide/pages/sysadmin/System_Utilities.po
A	po/id/rawhide/pages/welcome/Hardware_Overview.po
A	po/id/rawhide/pages/welcome/Welcome.po
Falling back to patching base and 3-way merge...
Auto-merging po/fr/rawhide/pages/index.po
Auto-merging po/fr/rawhide/pages/desktop/Desktop_index.po
Auto-merging po/fr/rawhide/nav.po
Auto-merging po/es/f35/pages/developers/Development_Ruby.po
Auto-merging po/de/f35/pages/welcome/Welcome.po
Auto-merging po/de/f35/pages/welcome/Hardware_Overview.po
Auto-merging po/de/f35/pages/sysadmin/System_Utilities.po
Auto-merging po/de/f35/pages/sysadmin/Storage.po
Auto-merging po/de/f35/pages/sysadmin/Security.po
Auto-merging po/de/f35/pages/sysadmin/Installation.po
Auto-merging po/de/f35/pages/developers/Development_Go.po
Auto-merging po/de/f35/pages/_partials/Legal_Notice.po
Auto-merging po/de/f30/pages/developers/Development_Tools.po
Auto-merging po/de/f30/pages/Revision_History.po
Auto-merging po/cs/rawhide/pages/sysadmin/Distribution.po~
CONFLICT (content): Merge conflict in po/cs/rawhide/pages/sysadmin/Distribution.po~
Auto-merging po/cs/f34/pages/sysadmin/Sysadmins.po
Auto-merging po/cs/f34/pages/developers/Development_C.po
Auto-merging po/ar/f34/pages/sysadmin/Printing_Scanning.po
Auto-merging po/ar/f34/pages/sysadmin/Networking.po
Auto-merging po/ar/f34/pages/developers/Development_Web.po
Auto-merging po/ar/f34/pages/developers/Development_Python.po
Auto-merging po/ar/f34/pages/developers/Development_LLVM.po
Auto-merging po/ar/f34/pages/developers/Development_Haskell.po
Auto-merging po/ar/f34/pages/developers/Development_Binutils.po
Auto-merging po/ar/f34/pages/developers/Developers.po
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Indonesian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
a year ago
User avatar None

Repository notification received

Pagure: https://pagure.io/fedora-docs-l10n/fedora-release-notes, master a year ago
User avatar None

Suggestion added

a year ago
User avatar None

Suggestion added

a year ago
User avatar None

Suggestion added

a year ago
User avatar None

Suggestion added

a year ago

Search